diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 8eb47dc..e02c83d 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -993,7 +993,8 @@
 	
 				if ($this->send_multipart === FALSE)
 				{
-					$hdr .= "Content-Type: text/html;". $this->newline;
+					$hdr .= "Content-Type: text/html; charset=" . $this->charset . $this->newline;
+					$hdr .= "Content-Transfer-Encoding: quoted-printable";
 				}
 				else
 				{	
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 110f1c2..469a950 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -102,6 +102,7 @@
 	<li>Removed some unused variables from the code (#4563).</li>
 	<li>Fixed a bug where <kbd>having()</kbd> was not adding an = into the statement (#4568).</li>
 	<li>Fixed assorted user guide typos or examples (#4574).</li>
+	<li>Added quoted-printable headers to Email class when the multi-part override is used.</li>
 	</ul>
 
 <h2>Version 1.6.2</h2>